More fixes/cleanup; should be ready for lab release now.