suggested changes, some TODOs

Great work, especially with your string formatting.  Drilling will just help cement the fundamentals...