Add a few small fixes and some extra options