Some minor adjustments

Optimization, battery saving, comments