added comments, surround plugin + changed f8 to f3 for searching shortcut