Various improvements, one of them laptop specific