assorted tweaks

had more but had to discard to sync, now it won't recognize changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html