Merge develop to master

1. fixing some typos
1. making some bits more clear