Updated settings file, fixed some potential bugs in the driver