Major changes to hazards model, some changes to theft model, better code with less magic numbers