fixes by Sinan Unur
start working on next edition