bug fixes on the fly