Assorted minor fixes
Abstract tweaks
Merge pull request #100 from ayshih/ays

Assorted minor fixes