Some fixes, some fine tuning.