Cleaned up carousel and general maintenance