Removed restart code, added separte functions and module for mtarix generation. Modifying startup defaults.