Fixes and fine tuning.