fixes, deployed & tested on all 3 devices