Tweaks, test refactoring, start some docs