Attempt at fixing #19, added messages on fail, removed yields, fixed some random stuff