Tweaked equals() method generation a bit; also added attempts to fix the build process in Eclipse (which didn't work)