remove Lang
some fixes
some cleanup