fixed some bugs
something here