Fixed alot of bugs
Removed unneeded files