Fixing some logic on scoring and ui, adding support for Safety