A few tweaks to argument passing, variable names and protected support