Fixed some naming issues
Fixed master modifier to use the object as the "this" value.