fixes for curtain system 2