manual mode support added, tables finalized