fixes to hammer code and stuff