better buffering?
cleans up code and increments version