Merge merge-test2

fixes all existing chores bugs