Cleanup
Add lines and spiral modes