KI: improved (needs a little more), PP: fixed null row, refactored, table.js: tested embedded webpages (commented out code)
merge, no changes to master