fix stuff and rename sample