nearing the end, clean up and final tweaks