#85 + updates

Should clear all issues with #85.