fixes,changes,aditions