Removed todo and added more dev info