Closes #24, #23 and other minor enhancements