minor changes to formatting
rename wrap->marshall; add methods for all types except enum