implement remarks for #481, also add scheme as requested in #472