fixed some bugs, major improvements and stuff