bugfixing and prepare for release