Fixed Jade templates and some other stuff!