several updates, fixes