-Fixed the input validation and parsing
-Completed two comments and added "TODO:" lines to them.