Few bug fixes, ready for new release.