just small improvements :(