Fixed Bugs

Fixed ALOT of bugs