minor adds & skeletons