various fixes, battery nearly flat