Add check for existing source
Misc. tweaks