adding todo's, removing some config