fix some shit and sample