Comment cleanup, minor bug fixes on import fields