More logic issues resolved.