Pre-release

bug fixes