small table changes and patrick's changes