refactored features, added better gtd support