add force flag
lint warnings cleanup