cleanup of changes from LoLab-VU fork

John and I wanted to do a little housekeeping on these changes before accepting them into master. Thanks everyone who contributed to this!