refactor, minor fix, plane test