Changed and added a few things for NSDefaults