Beta 0.9?

Just some fixes.