several issues resolved