fixed some bugs, now everything works