some cleanup
some lang adjustments
added some things