Attempted better formatting of paramters...
Added more to the TODO list