Feature/post state fixes

small fixes before 0.6.7 release.