wrapping up additional fixes and issues