Various minor bug fixes + battery stopper test