major small improvements