fixed issues added