Minor bug fixes.
Minor changes and have zbuff.c use the new callbacks.