Add some changes from the jade branch

Signed-off-by: Timothy Gu <timothygu99@gmail.com>