various changes for the shiny new cocowizard