more cleanup; todo updated; better tracking/analytics