production fixes
merged master