Pushing code changed by Calc

Have yet to find all the changes but so far
Bug: Release Valve creates infinite stream