add marvel device and misc changes