Added some visual elements, and fixed turning
merged