More flexibility in input space delimiting
Added FROM rendering rule
Added special character margins back in