Fixed some bugs
Fixed more bugs