minor frontend stuff
better source labeling