tweaks; fix function calls