some fixes
Some fixes in 1st and adding 2nd