I went to Marrakech for a long weekend in 2012. It’s a beautiful city with amazing souks to visit and even a few bars that sell alcohol, although not cheap. They also have lovely local tea and coffee.
We went to a spa for a very relaxing massage and also camel riding, although if you really want to camel ride in the desert I’d suggest spending a bit more as the budget rides are not very good. There is also quite a good city bus tour, and of course you have to try the tagine!