registration, other tweaks