continuing bug fixing