add pick up and fixes