Resolved some warnings in eclipse.
More stuff (I really should use intelligent commit comments)