issues: fixed first round of issues