More bug squashing. Can now focus on the configuration window