fixes, adjustments, usability improvements