New feature update / fixed issues