Fixed accidentally autoboxed primitives
Satisfied all compiler warnings
Removed superfluous TODO tags
Changed tags to use the overriden toString method to get a description