Added battery support and fixed some sound control issues