update packages and improve whitespace handling