More carousel fun
General fixes.
More WIP