resolved parameter inconsistencies
removed todo task
corrected minor comment