Small improvements

Closes #28, #32, #34, #27.