Bug Fixes: 7,8,9,10, 13,15,18