Fixed and changed a couple of things