Marcin fixes
Fix transparency
Fix branching bug