Fixed a few warnings and made the wizard and the fieldsetting use table(s) instead of arraylist(s)