Added marvel, changed shutdown handling