Added +once: and -ignore:, minor code and documentation cleanup