fixed stuff
fixed some bugs