Fixed some things with lombok equals method and such...