Merge pull request #99 from ehsteve/master

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

Assorted minor fixes
@Cadair's small changes
Merge pull request #101 from Cadair/master

@Cadair's small changes
jack's edits