General tidy and lots of tweaks.
Added error propagation.
0.1.5