3.4.4 engine merge

silkicons
more aahh controls