resolves #3, resolves #4. R6 portable mode compatible now