Some fixes, tweaks and cosmetic changes.