Lots of improvements, further implementations of simbicon/cartwheel
stuff