Pretty stuff and more fixes (almost works)