stuff and more changes