Fix resources and up to #25