More feature tweaking