small changes, fixes