// small framework improvements