some tweaks
add labels