Many fixes, nearly complete other than first time startup animations