Add details on options and some more tweaks