Cleanup following rebase to faster quantity initialisation; docs/comments