Some adjustments for low power stuff, added buffer implementation