small improvements
final guidelines