Fixed Carosule

+fixed all the different things
Merge branch 'carasole'