Few more  fixes and a decent build, still in no shape for playing.