Clean up + rendering fixes