Added Elscreen support and some other changes