tweaks some handling of the options hash.  uses save! vs. save.  fixes whitespace