major update - includes watstats