first draft complete
tweaks