Changes, fixes & additions