various incremental changes