continuing bug fixes