improves labeling
adds elements
code cleanup, etc