Some minor fixes, test suite passing for implemented features