fix problems with the new comment header/footer format, rebuilt service layer