Added some options and tweaked defaults