bump cleanup/bugfixes