stylistic changes + changes in compatability tests