Fixed paths, improved setup script