Slight Mods
Recent Changes in a variety of places. Modifying based on chris's suggestions