Add post + fix some bugs