fixed some adding and removing stuff and added docs for Jeff package
fixed merge conflicts