small modifs here and there