A few tweaks and additions