cleaned up some compiler warnings and constants