test + minor tweaks