Progress with bug fixing