Minor changes made, fixed package-install bugs