updated jade and meteor, refactoring