fixed issues, added timeout, added MOSS sites