Enhancements and bug fixes based on issues

Closes #111