fixed caption and some aesthetics