some clarity fixes