stability/simplicity tweaks