Re-adding some stuff from 1.6.4
Partially fixed detailing