fixes small issues
fixes a bug
fixes small issues
fixes test