Some fixes and change in presentation