Fixed label ordering.
Slowly starting to get this whole testing thing.
Removed unneeded code. Fixed some logic issues.