fixes

Fixed issues 2,4,6,10,12,14