Bug fixes and user options