Better implementation of new tabletmode
Cleanup && Warning fixes