minor bug fixes
removed include/util.hpp