osuosl · Kennric · Mar 15, 2017 · Mar 5, 2017 · Mar 5, 2017 · Mar 5, 2017
diff --git a/barcamp-theme/templates/base.html b/barcamp-theme/templates/base.html
@@ -43,7 +43,7 @@
 				<h5>Want BBC updates?  Follow us!</h5><br>
 				<a href="https://groups.google.com/forum/#!forum/beaverbarcamp"><img src='{{ SITEURL }}/theme/img/google-plus-icon.png'></a>
 				<a href="http://twitter.com/beaverbarcamp"><img src="{{ SITEURL }}/theme/img/twitter-icon.png" alt="Twitter Icon"></a>
-				<a href="http://facebook.com/OSUOSL"><img src="{{ SITEURL }}/theme/img/facebook-icon.png" alt="Facebook icon"></a>
+				<a href="http://facebook.com/beaverbarcamp"><img src="{{ SITEURL }}/theme/img/facebook-icon.png" alt="Facebook icon"></a>
 			</div>
 			<div id="footer-credits">
 				<hr />

diff --git a/barcamp-theme/templates/index.html b/barcamp-theme/templates/index.html
@@ -5,7 +5,7 @@
         <h2>Share Your Passion</h2>
         <div id="beaver-small"><img src="{{ SITEURL }}/theme/img/beaver-small.gif" alt="Beaver Barcamp icon" /></div>
         <h4>{{ SITENAME }}</h4>
-        <span class="tab--tiny">Now with <a href="lightning-talks.html">Lightning Talks!</a></span>
+        <span class="tab--tiny">With <a href="pages/faq.html">Lightning Talks!</a></span>
         <h5>April 8, 2017 from 9am-6pm<br />Kelley Engineering Center<br>
         <p>Registration is free-- sign up today!</p>
         <a href="http://beaverbarcamp.eventbrite.com" id="register-button">Register</a></h5><br><br>

diff --git a/content/pages/FAQ.rst b/content/pages/FAQ.rst
@@ -21,8 +21,11 @@ Lightning talks are five minute presentations on any topic. At barcamp,
 the first session will include lightning talks in the barcamp style;
 anyone can sign up beforehand and present on any topic for up to
 five minutes instead of the full hour. We will still have full-length
-barcamp talks available during that session, but lightning talks will
-be an option.
+barcamp talks available in other rooms at that time. We only accept .pdf
+presentations which can be emailed to [email protected] or you can
+bring a flashdrive. We do not guarantee a presentation will work and reserve the
+right to ask presenters to speak without a visual aid or give the floor to
+another speaker.
 
 Who should present?
 ~~~~~~~~~~~~~~~~~~~
@@ -38,7 +41,7 @@ schedule, allowing for greater flexibility and fun.
 Do I have to present?
 ~~~~~~~~~~~~~~~~~~~~~
 
-Nope. You are welcome to participate however you are most comfortable.  Come and
+Nope. You are welcome to participate however you are most comfortable. Come and
 meet new people, learn something new, or participate in a discussion.
 
 
@@ -57,7 +60,7 @@ RSVP is not required, but we would love if you registered for the event on
 `EventBrite`_. This helps us plan for enough food and accommodate dietary
 restrictions.
 
-.. _EventBrite: https://beaverbarcamp.eventbrite.com 
+.. _EventBrite: https://beaverbarcamp.eventbrite.com
 
 
 Who should I contact to receive accommodations related to a disability?
@@ -69,8 +72,8 @@ Please contact the Open Source Lab at [email protected].
 Wi-Fi?
 ~~~~~~
 
-Wi-Fi will be available and free to use while at the conference. An account and
-password will be provided at the event.
+Oregon State provides a "Visitors" wi-fi that requires no username or password
+to access.
 
 
 Are food and drinks provided?
@@ -85,7 +88,9 @@ Where do I park?
 Free parking is widely available on campus on Saturdays, with the
 exception of reserved and metered stalls. There is a large parking lot
 to the north of Kelly Engineering that should have enough room for
-everyone.
+everyone. A detailed map can be found on the `About page`_.
+
+.. _About page: .../pages/about.html
 
 
 What will the session topics be?

diff --git a/content/pages/about.rst b/content/pages/about.rst
@@ -58,26 +58,44 @@ spawn other sessions randomly.
 
 Directions
 ~~~~~~~~~~
+
+Beaver BarCamp takes place at `Kelley Engineering Center`_ on the Corvallis
+campus at Oregon State University. Please note, Google maps does not show
+Johnson Hall just northwest of Kelley. The parking lot displayed is smaller as a
+result.
+
 `Coming from I5 south`_
 
-1. Take exit 228 for OR-34 towards Lebanon/Corvallis.
-2. At the end of the off-ramp, turn right onto OR-34 W/Corvallis-Lebanon Hwy 210.
+1. Take exit 228 for OR-34 towards Lebanon/Corvallis
+2. At the end of the off-ramp, turn right onto OR-34 W/Corvallis-Lebanon Hwy 210
 
 `Coming from I5 north`_
 
-1. Take exit 228 for OR-34 toward Lebanon/Corvallis.
-2. At the end of the off-ramp, turn left onto OR-34 W/Corvallis-Lebanon Hwy 210.
+1. Take exit 228 for OR-34 toward Lebanon/Corvallis
+2. At the end of the off-ramp, turn left onto OR-34 W/Corvallis-Lebanon Hwy 210
 
 **From there:**
 
-3. Drive for 9.6 miles, then turn left onto OR-34 Bypass W/Corvallis-Newport Hwy.
-4. Drive for 1.3 miles, then turn right onto SW 15th st.
+3. Drive for 9.6 miles, then turn left onto OR-34 Bypass W/Corvallis-Newport Hwy
+4. Drive for 1.3 miles, then turn right onto SW 15th St
 5. Turn left onto SW Washington Way
-6. Turn right onto SW 26th.
-7. Turn right onto SW Campus Way.
+6. Turn right onto SW 26th
+7. Turn right onto SW Campus Way
+
+`From OR-99W S/Pacific Hwy W`_
+
+1. Turn right onto NW Harrison Blvd
+2. Turn left on NW 25th St
+3. Continue straight onto SW Park Terrace Pl
 
-Arrive at Kelley Engineering Center! Hope you enjoy your visit.
+`From OR-99W N/Pacific Hwy W`_
 
+1. Turn left onto SW Western Blvd
+2. Turn right onto SW 15th St
+3. Turn left onto NW Monroe Ave
+4. Turn left onto SW Park Terrace Pl
+
+Arrive at Kelley Engineering Center! Enjoy your visit!
 
 Parking
 ~~~~~~~
@@ -98,3 +116,7 @@ visiting the `university calendar`_ to check for possible conflicts.
 .. _Kelley Engineering Center: https://maps.google.com/maps?q=kelley+engineering+center&oe=utf-8&aq=t&client=firefox-a&ie=UTF8&hl=en&hq=&hnear=Kelley+Engineering+Center,+2500+NW+Monroe+Ave,+Corvallis,+Benton,+Oregon+97331&t=h&z=16&vpsrc=0&iwloc=A
 
 .. _university calendar: http://calendar.oregonstate.edu/
+
+.. _From OR-99W S/Pacific Hwy W: https://www.google.com/maps/dir/OR-99W,+Portland,+OR/Kelley+Engineering+Center,+Northwest+Monroe+Avenue,+Corvallis,+OR/@44.5980445,-123.2975416,13z/am=t/data=!4m14!4m13!1m5!1m1!1s0x54c0078908a8251f:0xa81eaf81484471d0!2m2!1d-123.2414648!2d44.6287827!1m5!1m1!1s0x54c040bc6e8da8b9:0xe18e3f794a561546!2m2!1d-123.2786573!2d44.5671949!3e0
+
+.. _From OR-99W N/Pacific Hwy W: https://www.google.com/maps/dir/44.5483878,-123.2655407/Kelley+Engineering+Center,+Northwest+Monroe+Avenue,+Corvallis,+OR/@44.5586016,-123.2799854,15z/am=t/data=!3m1!4b1!4m14!4m13!1m5!3m4!1m2!1d-123.2742592!2d44.5611443!3s0x54c040c742f29eed:0x7a25dac43fe39b75!1m5!1m1!1s0x54c040bc6e8da8b9:0xe18e3f794a561546!2m2!1d-123.2786573!2d44.5671949!3e0
diff --git a/content/pages/session-ideas.rst b/content/pages/session-ideas.rst
@@ -6,15 +6,18 @@ Most sessions do not require prepared slides and we even encourage you not to
 use them. We also encourage non-tech sessions and open discussion on a variety
 of topics. BarCamp is an excellent way to test out your public speaking skills.
 
-Here are some session ideas taken from past Beaver BarCamps:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Here are some session ideas to inspire:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ========================================================= ========================================================
- -Mead Brewing                                            -Let's build a NING website       
- -Google App Engine                                       -Compression Air Vehicles         
- -Coffee Q & A: Learn to roast and brew from scratch!     -OSU Robotics                     
- -Discuss Embedded Linux                                  -Poker Theory & Hold 'em Strategy 
- -Green Computing: How to go about using thin clients     -Raspberry Pi: the items, the reasons, the possibilities 
- -Introduction to the study of Martial Arts               -USB Microscope                    
- -Intro to SELinux                                        -Want to try yoga?    
-========================================================= ======================================================== 
+ -Mead Brewing                                            -Let's build a NING website
+ -Google App Engine                                       -Compression Air Vehicles
+ -Glass blowing                                           -Faulkner: What is he talking about?
+ -Coffee Q & A: Learn to roast and brew from scratch!     -OSU Robotics
+ -Discuss Embedded Linux                                  -Poker Theory & Hold 'em Strategy
+ -Changes in teaching computer science                    -Music and technology
+ -Green Computing: How to go about using thin clients     -Raspberry Pi: the items, the reasons, the possibilities
+ -Introduction to the study of Martial Arts               -USB Microscope
+ -How is technology changing my field of interest?        -Staying organized
+ -Intro to SELinux                                        -Want to try yoga?
+========================================================= ========================================================
diff --git a/content/pages/sponsor.rst b/content/pages/sponsor.rst
@@ -5,4 +5,4 @@ Sponsor
 Interested in Sponsoring Beaver Barcamp?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please email us at *info < at > beaverbarcamp.org*.
+Please email us at **info@beaverbarcamp.org**.