some changes, fixes.