cleaned up comments
added todo