Moar Fixes ( I am actually working on two different machines )