made additional fixes