Update issues

Issues fixed with brances