pushing additional fixes