Adds additional fixes, tests.