varous changes, fixes