Added Gaurav's stuff, updated more options