adding labels
clean up before merging + set correct flags for options