Changes to core for the new services code
Fixing line_in and a few typos
Merge pull request #52 from lawrenceakka/new-core

Changes to core for the new services code