Fixed some bugs
Fixed more bugs. Looks great