cleaning comments and includes
improved encoder responsiveness and speed