Fixed alot of bugs
Just hashed out a few things