generic wireframe and pointcloud added, small refactoring