Fix/clean a few things, first sample