added more datapoints on entities and logging
added 'warmup' state