small fixes, ready for publishing