bugfixes and carousel functionality