cosmetics changes here and there
add primitive backward compatibility test. wip