did some cleanup and got things compliling again