encoding lines added
Some controllers edited.