More fixes + proper valve rendering