Minor enhancements and bug fixes, 0.5.3