Added result collation; minor tweaks