Actually changes questions + general changes
Merge pull request #73 from Folashade/sri

Actually changes questions + general changes