small improvements, tweaks.