Fix doubled company error when operating on Library instead of just scoping within it

Various other fixes

Needs some spec fixes
Merge branch 'master' of github.com:Twistage/helix