fixed some bugs, little updates