some issues resolved