cleanup shader gen + fix obvious issues