Fix some bugs
Add some visual improv
Add some impr