tweaks on warnings
unused import
Tweaks n fixes