Fixed Problems and added a few things