hot fixes and new tables