mostly done, tweaks now