A number of small fixes and improvements, plus a new versification system