Jmacglashan

A bunch of helpful additions.