alot of bug fixes
fixed a lot of bugs