Added more loop forms and updated for recent caterwaul version