Fixed up wrappers and write variables tables for user reference