More class skeletons and minor fixes [ci skip]