Improvements

this closes #77 as well.