initialize other baton members
add missing type
add additional guard when retrieving suggestions
misc changes