Fixed some bugs
Fixed some more bugs