Did some cleaning up; basic skeleton view.