fixed some bugs, can now rename