More user options, bug fixes.