Prepping release. Fixed globals