ready for release (fixes and adjustments)