Fix extra whitespace in code sections
Fixed em, b, substitution functions (were always returning blank)
Merge branch 'specific_needs' into my-enhancements