Updated submodules, added shortcuts to variables