tweaking search
tweaking handbrake cluster post
Tweaking moving to NFSN post
tweaking workspace file
fixing merge conflicts