Texture loading + some cleanup