infobox added and some bug fixing