Updated settings and added some error stuff