Fixed some oddities and moving post hook and pre hook to appropriate places