Update more specs, fix some bugs