fixed globals, took away extra stupid stuff