various bug fixes and updates
various bug fixes and updates