fixed issued with &
improve stuff