some changes, fixes