Modernize Jade's, fix jade bugs