Added the stuff I could not squeeze into the workshop