tweaks (sorry for multiple commits, pulling code accross devices during tests)