Fix Martin comments and added todo's