Removed trash and fixed some minor bugs