Fixes, some code amendmets and adding the Post annotation (not tested yet)