Some fixes and additional comments