Different Engine updates

Most are cosmetical