Fixes for QA

-changed data structure, to hash map
-took out unneeded imports
-changed == to .equals where appropriate
-fixed hard coded names (Note we should change that to like a static
class or something in the future)