First portion of referee fixes

f some little fixes in the basic logic