Fixed some bug
Trying to get things back to the way they were
b
made a few changes
Merging