More feature implementations and fixes