Signing! Also some minor tweaks.