Minor Updates

Safety checks
Added statistics time