cleaned up handling of user options in Scape-M part