Added some config options, pickup logic