Fix #50: Fix typos in resources and step factory, change steps to only use one equipment