minor

comments/todo's etc