Local changes for bug/stability/random shit i thought up