Add instructions and more genericness, as well as lcoation support