a bunch of stuff from last week

issue #28, issue #26