Added public speaking, and some tweaks