Lots of improvements, v1.0.2