fixed few Issues