attempt to make default behaviour right, broke the build into multiple images, more docco tweaking