Minor fixes & additions