some fixes and post updates