Some fixes and presentation