Fixed entities moved some stuff around