Few errors fixed
Hack fixed