Much dialyzer + edoc, plus bug fixes along the way
Clean up merge conflicts with origin