lots of improvements
continue updating style, start working on geometry