last few changes to hashcode stuff