added timeout for demos and got arc tangeant angle correction working