implemented post update
small fixes
added uglyhack for post 8680