minor solution tweaks