battery and timer done

also general cleanup