Minor additions, typo+code fixes