Missing refresh of switch textures added, removed some warnings
changed parameter back to default