improved bundle handling, fixed unicorn recipe
improved bundle handling, fixed unicorn recipe