various changes on macbook
* thingsToKnowOhOh.txt:
merge