fixed some bugs, created more