Latest update, fixed a lot of bugs

Latest update, fixed a lot of bugs