Updates!

I totally forgot to commit these before, so sorry for the monolithic
commit!
Add option command
Add rewrite module