adding a few more fixes & notes