several updates to fix issues