small improvements, ok thx