continued fixing and integrating stuff (now installs and executes on my system)