Updated

Removed extranious files
Fixed a few bugs