Fixing issues
adding more fixes