- added proper global management; - made some files strict that werent