minor fixes, javascript, labels, etc