More work on fixing Loop using itself
Minor fixes
Use vendor as top directory