Fixing a few default options and added a ton of specs

Only 5 pending specs remain!