Updated for buffering, bitmap fix