Bonfire additions, bug fixing and bug creating