Bug fix + minor aesthetic changes