fixed objects and added safety as scoring