Progressing 3

Lotsa Errors fixed.
Events removed(because they are useless right now).
Code tidied up alot