fixed references to Marvin