Usability enhancements

Issue #10