removed todo's
added comments