few tweaks here and there, hopefully clarifying