Add post handlers, clean 2 issues