some small modifs