Visual updates, fix some bugs