remove more defines
added more util functions
added even more util functions
added more util functions