Various fixes & more battery life