Fix some bugs and fill in some missing info