Fixed Jade errors and buggy features