Some changes, additions from analytics-pros

Added some experimental things...