All kinds of good fixes, updates, improvements