grab feature done + misc changes