continued bug fixing