Hopefully final revisions
Late night tweaks

couldn't sleep, so might as well get last-minute changes done!