Edited several textures and cleanup