added info
fixed conflicts with erik, we're cool now