fixed few bugs, package now installs correctly