3-11 bug fixes and more functionality