updated the build file to avoid a warning
removed lint warnings
added 'contain' methods to avoid auto-tupling