Fork changes

Includes #65, #66, #67, #71 and #74 among others.