Add a small table, some minor improvements