fixed features and marked one WIP as pending