A lot of fixes because of recent changes, added a new sample who will be used for #1GM contest