Even more fixes...  I think it's getting halfway usable now...