added wirefames, code reformat