Bug fixes + began materials manager