Fixed another load of issues!