Registration with options and other small tweaks