Fixes #114 - Removed references to `err`, correct assertions/comments