Hopefully fixed the need for System Variables and other minor adjustments