logging, bug fixes, performance