things compile again and seem to work...