Few minor changes
fixed imports