Various more refactorings, rendering broke