Fixed bugs

Finish everything