Many tweaks - draft complete