bug fixes and new core.async