Large number of improvements and fixes. This is all still alpha, of course.