Add data for a few tables and fix some bugs