Basic revisions for my use

Started changing out the defaults for my own use.