Speedup some site queries and cleaned up some of the monitoring modifications.