Change list creation code, minor changes, add guava