little tweaks, testing on device