fixing up in globals, added TODO