some slight improvements