fixed up jade and made it more systematic