updates in general
fixed merged issues: