bugfixes for final release