Version 0.93 - a few correction & reordering of table