added marvin path to admin settings
clean up code
clean up code