clean up phase 2

try to get rid of notification long press fc
few corrections