Some enhancements

- begin and end statements are allowed to contain newlines
- the "-s" flag is no longer required and is deprecated