Client pretty much done for now, some build fixes