updated with names that work, readme
merge with remote