small tweaks to fred's solar stuff