Went through TODO list and removed things that were done. Added some new fixes.
Merge branch 'master' of github.com:10336-TeamB/APFTesting