Some more fixes, wireframe activated for debugging some changes and clean ups, some optimization etc.