Fixed alot of bugs...