Worked out final bugs, more or less ready for demo