added argparse / more for package installation
fixed merge conflict + modified some function names