Fixed odd behaviour, ...

Also added table, …