added final fixes to patch up stuff, semi permeannent