various improvements. added wireframing