Buffer Implementation Fix & Code Cleanup

Apparently I lost the Buffer % status calc and never actually committed
it.  Fixed that and changed code around to be a little prettier.  Still
a lot of work to be done.