bug fixes and additions based on kofi feedback doc