Fixed a lot of things

It's great. but full of bugs.