Fixes: usability and style issues