Added some nice odds and ends, fixed up some options.