Adds block buffer generation and polishes out some bugs