Comments, minor tweak to make timeout a variable