removed some warnings and things