fixed some bugs, testing...