Minor fixes and ready for the workshop!