diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 4390359d..836a9b4f 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -13,12 +13,12 @@ class AdminController < ApplicationController
           "\n\n" +
           "(WARNING: this will destroy content of your current wiki)."
       redirect_home(@wiki.webs.keys.first)
-    elsif @params['web_name']
+    elsif params['web_name']
       # form submitted -> create a wiki
-      @wiki.setup(@params['password'], @params['web_name'], @params['web_address']) 
-      flash[:info] = "Your new wiki '#{@params['web_name']}' is created!\n" + 
+      @wiki.setup(params['password'], params['web_name'], params['web_address']) 
+      flash[:info] = "Your new wiki '#{params['web_name']}' is created!\n" + 
           "Please edit its home page and press Submit when finished."
-      redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new', 
+      redirect_to :web => params['web_address'], :controller => 'wiki', :action => 'new', 
           :id => 'HomePage'
     else
       # no form submitted -> go to template
@@ -26,13 +26,13 @@ class AdminController < ApplicationController
   end
 
   def create_web
-    if @params['address']
+    if params['address']
       # form submitted
-      if @wiki.authenticate(@params['system_password'])
+      if @wiki.authenticate(params['system_password'])
         begin
-          @wiki.create_web(@params['name'], @params['address'])
-          flash[:info] = "New web '#{@params['name']}' successfully created."
-          redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new', 
+          @wiki.create_web(params['name'], params['address'])
+          flash[:info] = "New web '#{params['name']}' successfully created."
+          redirect_to :web => params['address'], :controller => 'wiki', :action => 'new', 
               :id => 'HomePage'
         rescue Instiki::ValidationError => e
           @error = e.message
@@ -47,25 +47,25 @@ class AdminController < ApplicationController
   end
 
   def edit_web
-    system_password = @params['system_password']
+    system_password = params['system_password']
     if system_password
       # form submitted
       if wiki.authenticate(system_password)
         begin
           wiki.edit_web(
-            @web.address, @params['address'], @params['name'], 
-            @params['markup'].intern, 
-            @params['color'], @params['additional_style'], 
-            @params['safe_mode'] ? true : false, 
-            @params['password'].empty? ? nil : @params['password'],
-            @params['published'] ? true : false, 
-            @params['brackets_only'] ? true : false,
-            @params['count_pages'] ? true : false,
-            @params['allow_uploads'] ? true : false,
-            @params['max_upload_size']
+            @web.address, params['address'], params['name'], 
+            params['markup'].intern, 
+            params['color'], params['additional_style'], 
+            params['safe_mode'] ? true : false, 
+            params['password'].empty? ? nil : params['password'],
+            params['published'] ? true : false, 
+            params['brackets_only'] ? true : false,
+            params['count_pages'] ? true : false,
+            params['allow_uploads'] ? true : false,
+            params['max_upload_size']
           )
-          flash[:info] = "Web '#{@params['address']}' was successfully updated"
-          redirect_home(@params['address'])
+          flash[:info] = "Web '#{params['address']}' was successfully updated"
+          redirect_home(params['address'])
         rescue Instiki::ValidationError => e
           logger.warn e.message
           @error = e.message
@@ -81,12 +81,12 @@ class AdminController < ApplicationController
   end
 
   def remove_orphaned_pages
-    if wiki.authenticate(@params['system_password_orphaned'])
+    if wiki.authenticate(params['system_password_orphaned'])
       wiki.remove_orphaned_pages(@web_name)
       flash[:info] = 'Orphaned pages removed'
       redirect_to :controller => 'wiki', :web => @web_name, :action => 'list'
     else
-      flash[:error] = password_error(@params['system_password_orphaned'])
+      flash[:error] = password_error(params['system_password_orphaned'])
       redirect_to :controller => 'admin', :web => @web_name, :action => 'edit_web'
     end
   end
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 60a5faec..73cb48ef 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -29,8 +29,8 @@ class ApplicationController < ActionController::Base
   end
 
   def connect_to_model
-    @action_name = @params['action'] || 'index'
-    @web_name = @params['web']
+    @action_name = params['action'] || 'index'
+    @web_name = params['web']
     @wiki = wiki
     @author = cookies['author'] || 'AnonymousCoward'
     if @web_name
@@ -105,11 +105,11 @@ class ApplicationController < ActionController::Base
   end
 
   def remember_location
-    if @request.method == :get and 
-        @response.headers['Status'] == '200 OK' and not
+    if request.method == :get and 
+        response.headers['Status'] == '200 OK' and not
         %w(locked save back file pic import).include?(action_name)
-      @session[:return_to] = @request.request_uri
-      logger.debug "Session ##{session.object_id}: remembered URL '#{@session[:return_to]}'"
+      session[:return_to] = request.request_uri
+      logger.debug "Session ##{session.object_id}: remembered URL '#{session[:return_to]}'"
     end
   end
 
@@ -125,8 +125,8 @@ class ApplicationController < ActionController::Base
 
   def return_to_last_remembered
     # Forget the redirect location
-    redirect_target, @session[:return_to] = @session[:return_to], nil
-    tried_home, @session[:tried_home] = @session[:tried_home], false
+    redirect_target, session[:return_to] = session[:return_to], nil
+    tried_home, session[:tried_home] = session[:tried_home], false
 
     # then try to redirect to it
     if redirect_target.nil?
@@ -145,9 +145,9 @@ class ApplicationController < ActionController::Base
 
   def set_content_type_header
     if %w(rss_with_content rss_with_headlines).include?(action_name)
-      @response.headers['Content-Type'] = 'text/xml; charset=UTF-8'
+      response.headers['Content-Type'] = 'text/xml; charset=UTF-8'
     else
-      @response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
     end
   end
 
@@ -185,7 +185,7 @@ class ApplicationController < ActionController::Base
     @web.nil? or
     @web.password.nil? or
     cookies[CGI.escape(@web_name)] == @web.password or
-    password_check(@params['password'])
+    password_check(params['password'])
   end
 
 end
diff --git a/app/controllers/file_controller.rb b/app/controllers/file_controller.rb
index 865450aa..51ecced2 100644
--- a/app/controllers/file_controller.rb
+++ b/app/controllers/file_controller.rb
@@ -10,9 +10,9 @@ class FileController < ApplicationController
 
   def file
     @file_name = params['id']
-    if @params['file']
+    if params['file']
       # form supplied
-      new_file = @web.wiki_files.create(@params['file'])
+      new_file = @web.wiki_files.create(params['file'])
       if new_file.valid?
         flash[:info] = "File '#{@file_name}' successfully uploaded"
         return_to_last_remembered
@@ -38,10 +38,10 @@ class FileController < ApplicationController
   end
   
   def import
-    if @params['file']
+    if params['file']
       @problems = []
       import_file_name = "#{@web.address}-import-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}.zip"
-      import_from_archive(@params['file'].path)
+      import_from_archive(params['file'].path)
       if @problems.empty?
         flash[:info] = 'Import successfully finished'
       else
@@ -57,7 +57,7 @@ class FileController < ApplicationController
   protected
 
   def check_allow_uploads
-    render(:status => 404, :text => "Web #{@params['web'].inspect} not found") and return false unless @web
+    render(:status => 404, :text => "Web #{params['web'].inspect} not found") and return false unless @web
     if @web.allow_uploads?
       return true
     else
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 6bf52f7c..b2a58d63 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -26,10 +26,10 @@ class WikiController < ApplicationController
   # Outside a single web --------------------------------------------------------
 
   def authenticate
-    if password_check(@params['password'])
+    if password_check(params['password'])
       redirect_home
     else 
-      flash[:info] = password_error(@params['password'])
+      flash[:info] = password_error(params['password'])
       redirect_to :action => 'login', :web => @web_name
     end
   end
@@ -144,7 +144,7 @@ class WikiController < ApplicationController
   end
 
   def search
-    @query = @params['query']
+    @query = params['query']
     @title_results = @web.select { |page| page.name =~ /#{@query}/i }.sort
     @results = @web.select { |page| page.content =~ /#{@query}/i }.sort
     all_pages_found = (@results + @title_results).uniq
@@ -163,7 +163,7 @@ class WikiController < ApplicationController
   def edit
     if @page.nil?
       redirect_home
-    elsif @page.locked?(Time.now) and not @params['break_lock']
+    elsif @page.locked?(Time.now) and not params['break_lock']
       redirect_to :web => @web_name, :action => 'locked', :id => @page_name
     else
       @page.lock(Time.now, @author)
@@ -214,7 +214,7 @@ class WikiController < ApplicationController
   
   def revision
     get_page_and_revision
-    @show_diff = (@params[:mode] == 'diff')
+    @show_diff = (params[:mode] == 'diff')
     @renderer = PageRenderer.new(@revision)
   end
 
@@ -225,25 +225,25 @@ class WikiController < ApplicationController
   def save
     render(:status => 404, :text => 'Undefined page name') and return if @page_name.nil?
 
-    author_name = @params['author']
+    author_name = params['author']
     author_name = 'AnonymousCoward' if author_name =~ /^\s*$/
     cookies['author'] = { :value => author_name, :expires => Time.utc(2030) }
     
     begin
-      filter_spam(@params['content'])
+      filter_spam(params['content'])
       if @page
-        wiki.revise_page(@web_name, @page_name, @params['content'], Time.now, 
+        wiki.revise_page(@web_name, @page_name, params['content'], Time.now, 
             Author.new(author_name, remote_ip), PageRenderer.new)
         @page.unlock
       else
-        wiki.write_page(@web_name, @page_name, @params['content'], Time.now, 
+        wiki.write_page(@web_name, @page_name, params['content'], Time.now, 
             Author.new(author_name, remote_ip), PageRenderer.new)
       end
       redirect_to_page @page_name
     rescue => e
       flash[:error] = e
       logger.error e
-      flash[:content] = @params['content']
+      flash[:content] = params['content']
       if @page
         @page.unlock
         redirect_to :action => 'edit', :web => @web_name, :id => @page_name
@@ -257,7 +257,7 @@ class WikiController < ApplicationController
     if @page
       begin
         @renderer = PageRenderer.new(@page.revisions.last)
-        @show_diff = (@params[:mode] == 'diff')
+        @show_diff = (params[:mode] == 'diff')
         render_action 'page'
       # TODO this rescue should differentiate between errors due to rendering and errors in 
       # the application itself (for application errors, it's better not to rescue the error at all)
@@ -286,7 +286,7 @@ class WikiController < ApplicationController
   protected
   
   def load_page
-    @page_name = @params['id']
+    @page_name = params['id']
     @page = @wiki.read_page(@web_name, @page_name) if @page_name
   end
 
@@ -339,8 +339,8 @@ class WikiController < ApplicationController
   end
 
   def get_page_and_revision
-    if @params['rev']
-      @revision_number = @params['rev'].to_i
+    if params['rev']
+      @revision_number = params['rev'].to_i
     else
       @revision_number = @page.revisions.length
     end
@@ -349,7 +349,7 @@ class WikiController < ApplicationController
 
   def parse_category
     @categories = WikiReference.list_categories.sort
-    @category = @params['category']
+    @category = params['category']
     if @category
       @set_name = "category '#{@category}'"
       pages = WikiReference.pages_in_category(@category).sort.map { |page_name| @web.page(page_name) }
@@ -362,19 +362,19 @@ class WikiController < ApplicationController
   end
 
   def parse_rss_params
-    if @params.include? 'limit'
-      limit = @params['limit'].to_i rescue nil
+    if params.include? 'limit'
+      limit = params['limit'].to_i rescue nil
       limit = nil if limit == 0
     else
       limit = 15
     end
-    start_date = Time.local(*ParseDate::parsedate(@params['start'])) rescue nil
-    end_date = Time.local(*ParseDate::parsedate(@params['end'])) rescue nil
+    start_date = Time.local(*ParseDate::parsedate(params['start'])) rescue nil
+    end_date = Time.local(*ParseDate::parsedate(params['end'])) rescue nil
     [ limit, start_date, end_date ]
   end
   
   def remote_ip
-    ip = @request.remote_ip
+    ip = request.remote_ip
     logger.info(ip)
     ip
   end
diff --git a/app/models/web.rb b/app/models/web.rb
index d9aff5ed..96b0896f 100644
--- a/app/models/web.rb
+++ b/app/models/web.rb
@@ -40,7 +40,7 @@ class Web < ActiveRecord::Base
   end
 
   def has_page?(name)
-    Page.count(['web_id = ? AND name = ?', id, name]) > 0
+    Page.count(:conditions => ['web_id = ? AND name = ?', id, name]) > 0
   end
 
   def has_file?(file_name)
diff --git a/app/views/admin/create_system.rhtml b/app/views/admin/create_system.rhtml
index f5d5ff7f..291c8b36 100644
--- a/app/views/admin/create_system.rhtml
+++ b/app/views/admin/create_system.rhtml
@@ -6,9 +6,9 @@
   you'll need to do a brief one-time setup.
 </p>
 
-<%= form_tag({ :controller => 'admin', :action => 'create_system' },
+<% form_tag({ :controller => 'admin', :action => 'create_system' },
              { 'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()', 
-               'accept-charset' => 'utf-8' })
+               'accept-charset' => 'utf-8' }) do
 %>
 <ol class="setup">
   <li>
@@ -46,7 +46,7 @@
 <p align="right">
     <input type="submit" value="Setup" style="margin-left: 40px" />
 </p>
-<%= end_form_tag %>
+<% end %>
 
 <script>
 function proposeAddress() {
diff --git a/app/views/admin/create_web.rhtml b/app/views/admin/create_web.rhtml
index 5b9e3f7e..66d094f7 100644
--- a/app/views/admin/create_web.rhtml
+++ b/app/views/admin/create_web.rhtml
@@ -5,10 +5,10 @@
   so different subjects or projects can write about different <i>MuppetShows</i>.
 </p>
 
-<%= form_tag({ :controller => 'admin', :action => 'create_web' },
+<% form_tag({ :controller => 'admin', :action => 'create_web' },
              { 'id' => 'setup', 'method' => 'post', 
                'onSubmit' => 'cleanAddress(); return validateSetup()',
-               'accept-charset' => 'utf-8' })
+               'accept-charset' => 'utf-8' }) do
 %>
 
 <ol class="setup">
@@ -38,7 +38,7 @@
   </small>
 </p>
 
-<%= end_form_tag %>
+<% end %>
 
 <script>
 function proposeAddress() {
diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index f77cac3e..76027634 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -1,9 +1,9 @@
 <% @title = "Edit Web" %>
 
-<%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
+<% form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
              { 'id' => 'setup', 'method' => 'post', 
                'onSubmit' => 'cleanAddress(); return validateSetup()',
-               'accept-charset' => 'utf-8' })
+               'accept-charset' => 'utf-8' }) do
 %>
 
   <h2 style="margin-bottom: 3px">Name and address</h2>
@@ -111,15 +111,15 @@
   </small>
 </p>
 
-<%= end_form_tag %>
+<% end %>
 
 <br/>
 <h1>Other administrative tasks</h1>
 
-<%= form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
+<% form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
         { :id => 'remove_orphaned_pages', 
           :onSubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)",
-          'accept-charset' => 'utf-8' }) 
+          'accept-charset' => 'utf-8' }) do
 %>
   <p align="right">
     <small>
@@ -129,6 +129,6 @@
       <input type="submit" value="Delete Orphan Pages" />
     </small>
   </p>
-<%= end_form_tag %>
+<% end %>
 
 <%= javascript_include_tag 'edit_web' %>
diff --git a/app/views/file/file.rhtml b/app/views/file/file.rhtml
index 9f67b9b8..4839c018 100644
--- a/app/views/file/file.rhtml
+++ b/app/views/file/file.rhtml
@@ -5,8 +5,8 @@
 
 <%= error_messages_for 'file' %>
 
-<%= form_tag({ :controller => 'file', :web => @web_name, :action => 'file' }, 
-        { 'multipart' => true , 'accept-charset' => 'utf-8' }) %>
+<% form_tag({ :controller => 'file', :web => @web_name, :action => 'file' }, 
+        { 'multipart' => true , 'accept-charset' => 'utf-8' }) do %>
   <%= hidden_field 'file', 'file_name' %>
   <div class="inputFieldWithPrompt">
     <b>Content of <%= h @file_name %> to upload <small>(required)</small>:</b>
@@ -30,4 +30,4 @@
             :onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
             :onblur  => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
   </div>
-<%= end_form_tag %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index a43a7660..d89ddd89 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -54,12 +54,12 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
 <%= render 'navigation' unless @web.nil? || @hide_navigation %>
 
-<% if @flash[:info] %>
-  <div class="info"><%= escape_preserving_linefeeds @flash[:info] %></div>
+<% if flash[:info] %>
+  <div class="info"><%= escape_preserving_linefeeds flash[:info] %></div>
 <% end %>
 
-<% if @error or @flash[:error] %> 
-    <div class="errorExplanation"><%= escape_preserving_linefeeds(@error || @flash[:error]) %></div>
+<% if @error or flash[:error] %> 
+    <div class="errorExplanation"><%= escape_preserving_linefeeds(@error || flash[:error]) %></div>
 <% end %>
 
 <%= @content_for_layout %>
diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml
index 5735b472..fedd5a7c 100644
--- a/app/views/navigation.rhtml
+++ b/app/views/navigation.rhtml
@@ -16,12 +16,12 @@ end
     <%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> | 
     <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | 
     <%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> |
-    <%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
-                 {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) %>
+    <% form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
+                 {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) do %>
       <input type="text" id="searchField" name="query" value="Search"
              onfocus="this.value == 'Search' ? this.value = '' : true"
              onblur="this.value == '' ? this.value = 'Search' : true" />
-    <%= end_form_tag %>
+    <% end %>
   <% else %>
   	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
   <% end%>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 2ca00efa..669933e0 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -10,11 +10,11 @@
 </div>
 
 <div id="editForm">
-	<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
+	<% form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
 	             { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()',
-	               'accept-charset' => 'utf-8' }) %>
+	               'accept-charset' => 'utf-8' }) do %>
 	
-		<textarea name="content" id="content"><%= h(@flash[:content] || @page.content) %></textarea>
+		<textarea name="content" id="content"><%= h(flash[:content] || @page.content) %></textarea>
 		<div id="editFormButtons">
 			<input type="submit" value="Submit" accesskey="s"/> as 
 			<%= text_field_tag :author, @author, 
@@ -27,7 +27,7 @@
                 <small>(unlocks page)</small>
 			</span>
 		</div>
-	<%= end_form_tag %>
+	<% end %>
 </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/wiki/login.rhtml b/app/views/wiki/login.rhtml
index 15582524..0fd4b09c 100644
--- a/app/views/wiki/login.rhtml
+++ b/app/views/wiki/login.rhtml
@@ -1,8 +1,8 @@
 <% @title = "#{@web_name} Login" %><% @hide_navigation = true %>
 
 <p>
-<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
-    { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' }) %>
+<% form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
+    { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' }) do %>
     <p>
     This web is password-protected. Please enter the password.
     <% if @web.published? %>
@@ -14,7 +14,7 @@
     <input type="password" name="password" id="password" />
     <input type="submit" value="Login" default="yes" />
     </p>
-<%= end_form_tag %>
+<% end %>
 </p>
 
 <script type="text/javascript">
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index b5929040..4d7f93e9 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -10,17 +10,17 @@
 </div>
 
 <div id="editForm">
-	<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
-	        { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) %>
+	<% form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
+	        { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) do %>
 	<div class="hidden"><textarea name="content1" id="content1">iam empty</textarea></div>
-	    <textarea name="content" id="content"><%= h(@flash[:content] || '') %></textarea>
+	    <textarea name="content" id="content"><%= h(flash[:content] || '') %></textarea>
 		<div id="editFormButtons">
 		    <input type="submit" value="Submit" accesskey="s"/> as 
 		    <%= text_field_tag :author, @author, 
 		        :onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
 		        :onblur  => "this.value == '' ? this.value = 'AnonymousCoward' : true" %> 
         </div>
-	<%= end_form_tag %>
+	<% end %>
 </div>
 
 <script type="text/javascript">
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml
index 0e4cbea2..d85619a0 100644
--- a/app/views/wiki/rollback.rhtml
+++ b/app/views/wiki/rollback.rhtml
@@ -4,7 +4,7 @@
   @hide_navigation = true
 %>
 
-<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
+<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{params["msg"]}</small></p>" if params["msg"] %>
 
 <div id="MarkupHelp">
   <%= render("#{@web.markup}_help") %>
@@ -12,9 +12,9 @@
 </div>
 
 <div id="editForm">
-	<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
+	<% form_tag({:web => @web.address, :action => 'save', :id => @page.name},
 	      { :id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();', 
-	        'accept-charset' => 'utf-8' }) %>
+	        'accept-charset' => 'utf-8' }) do %>
         <textarea name="content" id="content"><%= @revision.content %></textarea>
 		<div id="editFormButtons">
 	        <input type="submit" value="Update" accesskey="u" /> as 
@@ -27,7 +27,7 @@
                 <small>(unlocks page)</small>
 			</span>
 	    </div>
-	<%= end_form_tag %>
+	<% end %>
 </div>
 
 <script type="text/javascript">
diff --git a/app/views/wiki/search.rhtml b/app/views/wiki/search.rhtml
index 789f867c..5edd1c25 100644
--- a/app/views/wiki/search.rhtml
+++ b/app/views/wiki/search.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Search results for \"#{h @params["query"]}\"" %>
+<% @title = "Search results for \"#{h params["query"]}\"" %>
 
 <% unless @title_results.empty? %>
 <h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>
@@ -24,7 +24,7 @@
 <% end %>
 
 <% if (@results + @title_results).empty? %>
-  <h2>No pages contain "<%= h @params["query"] %>" </h2>
+  <h2>No pages contain "<%= h params["query"] %>" </h2>
   <p>
     Perhaps you should try expanding your query. Remember that Instiki searches for entire 
     phrases, so if you search for "all that jazz" it will not match pages that contain these 
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 6df919f3..0d438599 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -55,14 +55,14 @@ class AdminControllerTest < Test::Unit::TestCase
     assert_equal wiki_before, @wiki
     # and no new web should be created either
     assert_equal old_size, @wiki.webs.size
-    assert_flash_has :error
+    assert(@response.has_flash_object?(:error))
   end
 
   def test_create_system_no_form_and_wiki_already_initialized
     assert @wiki.setup?
     process('create_system')
     assert_redirected_to :web => @wiki.webs.keys.first, :action => 'show', :id => 'HomePage'
-    assert_flash_has :error
+    assert(@response.has_flash_object?(:error))
   end
 
 
diff --git a/test/functional/file_controller_test.rb b/test/functional/file_controller_test.rb
index 98288864..7fa783d7 100755
--- a/test/functional/file_controller_test.rb
+++ b/test/functional/file_controller_test.rb
@@ -24,8 +24,8 @@ class FileControllerTest < Test::Unit::TestCase
 
   def test_file_upload_form
     get :file, :web => 'wiki1', :id => 'new_file.txt'
-    assert_success
-    assert_rendered_file 'file/file'
+    assert_response(:success)
+    assert_template 'file/file'
   end
 
   def test_file_download_text_file
@@ -34,7 +34,7 @@ class FileControllerTest < Test::Unit::TestCase
 
     r = get :file, :web => 'wiki1', :id => 'foo.txt'
     
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal "Contents of the file", r.body
     assert_equal 'text/plain', r.headers['Content-Type']
   end
@@ -45,7 +45,7 @@ class FileControllerTest < Test::Unit::TestCase
   
     r = get :file, :web => 'wiki1', :id => 'foo.pdf'
     
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal "aaa\nbbb\n", r.body
     assert_equal 'application/pdf', r.headers['Content-Type']
   end
@@ -56,7 +56,7 @@ class FileControllerTest < Test::Unit::TestCase
     
     r = get :file, :web => 'wiki1', :id => 'rails.gif'
     
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal 'image/gif', r.headers['Content-Type']
     assert_equal pic.size, r.body.size
     assert_equal pic, r.body
@@ -65,8 +65,8 @@ class FileControllerTest < Test::Unit::TestCase
   def test_pic_unknown_pic
     r = get :file, :web => 'wiki1', :id => 'non-existant.gif'
     
-    assert_success
-    assert_rendered_file 'file/file'
+    assert_response(:success)
+    assert_template 'file/file'
   end
 
   def test_pic_upload_end_to_end
@@ -81,12 +81,13 @@ class FileControllerTest < Test::Unit::TestCase
   
     # rails-e2e.gif is unknown to the system, so pic action goes to the file [upload] form
     r = get :file, :web => 'wiki1', :id => 'rails-e2e.gif'
-    assert_success
-    assert_rendered_file 'file/file'
+    assert_response(:success)
+    assert_template 'file/file'
 
     # User uploads the picture
     picture = File.read("#{RAILS_ROOT}/test/fixtures/rails.gif")
-    r = post :file, :web => 'wiki1', 
+    # updated from post to get - post fails the spam protection (no javascript)
+    r = get :file, :web => 'wiki1', 
              :file => {:file_name => 'rails-e2e.gif',  :content => StringIO.new(picture)}
     assert_redirected_to({})
     assert @web.has_file?('rails-e2e.gif')
@@ -94,8 +95,9 @@ class FileControllerTest < Test::Unit::TestCase
   end
 
   def test_import
-    r = post :import, :web => 'wiki1', :file => uploaded_file("#{RAILS_ROOT}/test/fixtures/exported_markup.zip")
-    assert_redirect
+    # updated from post to get - post fails the spam protection (no javascript)
+    r = get :import, :web => 'wiki1', :file => uploaded_file("#{RAILS_ROOT}/test/fixtures/exported_markup.zip")
+    assert_response(:redirect)
     assert @web.has_page?('ImportedPage')
   end
 
diff --git a/test/functional/routes_test.rb b/test/functional/routes_test.rb
index 4ba2cec5..16452dec 100644
--- a/test/functional/routes_test.rb
+++ b/test/functional/routes_test.rb
@@ -28,7 +28,11 @@ class RoutesTest < Test::Unit::TestCase
 
     assert_routing('web/show/%24HOME_PAGE', 
         :controller => 'wiki', :web => 'web', :action => 'show', :id => '$HOME_PAGE')
-      
+        
+    assert_routing('web/show/HomePage%3F', 
+        :controller => 'wiki', :web => 'web', :action => 'show', 
+        :id => 'HomePage')
+        
     assert_routing('web/show/HomePage%3Farg1%3Dvalue1%26arg2%3Dvalue2', 
         :controller => 'wiki', :web => 'web', :action => 'show', 
         :id => 'HomePage?arg1=value1&arg2=value2')
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 3edf75b4..cbda9027 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -50,7 +50,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
     r = process('authors', 'web' => 'wiki1')
 
-    assert_success
+    assert_response(:success)
     assert_equal %w(AnAuthor BreakingTheOrder DavidHeinemeierHansson Guest Me TreeHugger), 
         r.template_objects['authors']
     page_names_by_author = r.template_objects['page_names_by_author'] 
@@ -70,7 +70,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
   def test_edit
     r = process 'edit', 'web' => 'wiki1', 'id' => 'HomePage'
-    assert_success
+    assert_response(:success)
     assert_equal @wiki.read_page('wiki1', 'HomePage'), r.template_objects['page']
   end
 
@@ -83,7 +83,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_edit_page_break_lock
     @home.lock(Time.now, 'Locky')
     process 'edit', 'web' => 'wiki1', 'id' => 'HomePage', 'break_lock' => 'y'
-    assert_success
+    assert_response(:success)
     @home = Page.find(@home.id)
     assert @home.locked?(Time.now)
   end
@@ -100,7 +100,7 @@ class WikiControllerTest < Test::Unit::TestCase
          test_renderer)
     
     r = process 'edit', 'web' => 'wiki1', 'id' => 'With : Special /> symbols'
-    assert_success
+    assert_response(:success)
     xml = REXML::Document.new(r.body)
     form = REXML::XPath.first(xml, '//form')
     assert_equal '/wiki1/save/With+%3A+Special+%2F%3E+symbols', form.attributes['action']
@@ -111,7 +111,7 @@ class WikiControllerTest < Test::Unit::TestCase
     @home.rollback(0, Time.now, 'Rick', test_renderer)
     r = process 'export_html', 'web' => 'wiki1'
     
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal 'application/zip', r.headers['Content-Type']
     assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, 
         r.headers['Content-Disposition']
@@ -139,7 +139,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_export_html_no_layout    
     r = process 'export_html', 'web' => 'wiki1', 'layout' => 'no'
     
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal 'application/zip', r.headers['Content-Type']
     assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, 
         r.headers['Content-Disposition']
@@ -149,7 +149,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_export_markup
     r = process 'export_markup', 'web' => 'wiki1'
 
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal 'application/zip', r.headers['Content-Type']
     assert_match /attachment; filename="wiki1-textile-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, 
         r.headers['Content-Disposition']
@@ -161,7 +161,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
     def test_export_pdf
       r = process 'export_pdf', 'web' => 'wiki1'
-      assert_success(bypass_body_parsing = true)
+      assert_response(:success, bypass_body_parsing = true)
       assert_equal 'application/pdf', r.headers['Content-Type']
       assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.pdf"/, 
           r.headers['Content-Disposition']
@@ -178,7 +178,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_export_tex    
     r = process 'export_tex', 'web' => 'wiki1'
 
-    assert_success(bypass_body_parsing = true)
+    assert_response(:success, bypass_body_parsing = true)
     assert_equal 'application/octet-stream', r.headers['Content-Type']
     assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.tex"/, 
         r.headers['Content-Disposition']
@@ -229,21 +229,21 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_locked
     @home.lock(Time.now, 'Locky')
     r = process('locked', 'web' => 'wiki1', 'id' => 'HomePage')
-    assert_success
+    assert_response(:success)
     assert_equal @home, r.template_objects['page']
   end
 
 
   def test_login
     r = process 'login', 'web' => 'wiki1'
-    assert_success
+    assert_response(:success)
     # this action goes straight to the templates
   end
 
 
   def test_new
     r = process('new', 'id' => 'NewPage', 'web' => 'wiki1')
-    assert_success
+    assert_response(:success)
     assert_equal 'AnonymousCoward', r.template_objects['author']
     assert_equal 'NewPage', r.template_objects['page_name']
   end
@@ -254,7 +254,7 @@ class WikiControllerTest < Test::Unit::TestCase
     def test_pdf
       assert RedClothForTex.available?, 'Cannot do test_pdf when pdflatex is not available'
       r = process('pdf', 'web' => 'wiki1', 'id' => 'HomePage')
-      assert_success(bypass_body_parsing = true)
+      assert_response(:success, bypass_body_parsing = true)
 
       assert_equal '%PDF', r.body[0..3]
       assert_equal "EOF\n", r.body[-4..-1]
@@ -270,7 +270,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_print
     r = process('print', 'web' => 'wiki1', 'id' => 'HomePage')
 
-    assert_success
+    assert_response(:success)
     assert_equal :show, r.template_objects['link_mode']
   end
 
@@ -280,7 +280,7 @@ class WikiControllerTest < Test::Unit::TestCase
     
     r = process('published', 'web' => 'wiki1', 'id' => 'HomePage')
     
-    assert_success
+    assert_response(:success)
     assert_equal @home, r.template_objects['page']
   end
 
@@ -298,14 +298,14 @@ class WikiControllerTest < Test::Unit::TestCase
     
     r = process('published', 'web' => 'wiki1')
     
-    assert_success
+    assert_response(:success)
     assert_equal @home, r.template_objects['page']
   end
 
 
   def test_recently_revised
     r = process('recently_revised', 'web' => 'wiki1')
-    assert_success
+    assert_response(:success)
     
     assert_equal %w(animals trees), r.template_objects['categories']
     assert_nil r.template_objects['category']
@@ -332,7 +332,7 @@ class WikiControllerTest < Test::Unit::TestCase
         Time.now, Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)
       
     r = process('recently_revised', 'web' => 'wiki1')
-    assert_success
+    assert_response(:success)
     
     assert_equal %w(animals categorized trees), r.template_objects['categories']
     # no category is specified in params
@@ -345,7 +345,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
   def test_recently_revised_with_categorized_page_multiple_categories
     r = process('recently_revised', 'web' => 'wiki1')
-    assert_success
+    assert_response(:success)
 
     assert_equal ['animals', 'trees'], r.template_objects['categories']
     # no category is specified in params
@@ -358,7 +358,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
   def test_recently_revised_with_specified_category
     r = process('recently_revised', 'web' => 'wiki1', 'category' => 'animals')
-    assert_success
+    assert_response(:success)
     
     assert_equal ['animals', 'trees'], r.template_objects['categories']
     # no category is specified in params
@@ -371,7 +371,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_revision
     r = process 'revision', 'web' => 'wiki1', 'id' => 'HomePage', 'rev' => '1'
 
-    assert_success
+    assert_response(:success)
     assert_equal @home, r.template_objects['page']
     assert_equal @home.revisions[0], r.template_objects['revision'] 
   end
@@ -382,7 +382,7 @@ class WikiControllerTest < Test::Unit::TestCase
     # its assigns the same as or revision
     r = process 'rollback', 'web' => 'wiki1', 'id' => 'HomePage', 'rev' => '1'
 
-    assert_success
+    assert_response(:success)
     assert_equal @home, r.template_objects['page']
     assert_equal @home.revisions[0], r.template_objects['revision']
   end
@@ -390,7 +390,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_rss_with_content
     r = process 'rss_with_content', 'web' => 'wiki1'
 
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal [@elephant, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages,
         "Pages are not as expected: #{pages.map {|p| p.name}.inspect}"
@@ -416,7 +416,7 @@ class WikiControllerTest < Test::Unit::TestCase
   
     r = process 'rss_with_headlines', 'web' => 'wiki1'
 
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal [@elephant, @title_with_spaces, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages, "Pages are not as expected: #{pages.map {|p| p.name}.inspect}"
     assert r.template_objects['hide_description']
@@ -450,7 +450,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
     r = process 'rss_with_headlines', 'web' => 'wiki1'
 
-    assert_success
+    assert_response(:success)
     xml = REXML::Document.new(r.body)
 
     expected_page_links =
@@ -473,37 +473,37 @@ class WikiControllerTest < Test::Unit::TestCase
     setup_wiki_with_30_pages
 
     r = process 'rss_with_headlines', 'web' => 'wiki1'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 15, pages.size, 15
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => '5'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 5, pages.size
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => '25'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 25, pages.size
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => 'all'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 38, pages.size
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-16'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 23, pages.size
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'end' => '1976-10-16'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 15, pages.size
     
     r = process 'rss_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-01', 'end' => '1976-10-06'
-    assert_success
+    assert_response(:success)
     pages = r.template_objects['pages_by_revision']
     assert_equal 5, pages.size
   end
@@ -565,7 +565,7 @@ class WikiControllerTest < Test::Unit::TestCase
         'author' => 'SomeOtherAuthor'}, {:return_to => '/wiki1/show/HomePage'}
 
     assert_redirected_to :action => 'edit', :web => 'wiki1', :id => 'HomePage'
-    assert_flash_has :error
+    assert(@response.has_key(:error))
     assert r.flash[:error].kind_of?(Instiki::ValidationError)
 
     revisions_after = @home.revisions.size
@@ -597,7 +597,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_search_multiple_results
     r = process 'search', 'web' => 'wiki1', 'query' => 'All about'
     
-    assert_success
+    assert_response(:success)
     assert_equal 'All about', r.template_objects['query']
     assert_equal [@elephant, @oak], r.template_objects['results']
     assert_equal [], r.template_objects['title_results']
@@ -606,7 +606,7 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_search_by_content_and_title
     r = process 'search', 'web' => 'wiki1', 'query' => '(Oak|Elephant)'
     
-    assert_success
+    assert_response(:success)
     assert_equal '(Oak|Elephant)', r.template_objects['query']
     assert_equal [@elephant, @oak], r.template_objects['results']
     assert_equal [@elephant, @oak], r.template_objects['title_results']
@@ -615,14 +615,14 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_search_zero_results
     r = process 'search', 'web' => 'wiki1', 'query' => 'non-existant text'
     
-    assert_success
+    assert_response(:success)
     assert_equal [], r.template_objects['results']
     assert_equal [], r.template_objects['title_results']
   end
 
   def test_show_page
     r = process('show', 'id' => 'Oak', 'web' => 'wiki1')
-    assert_success
+    assert_response(:success)
     assert_tag :content => /All about oak/
   end
 
@@ -632,7 +632,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
     r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
 
-    assert_success
+    assert_response(:success)
     assert_match /Second revision of the <a.*HomePage.*<\/a> end/, r.body
   end
 
@@ -651,7 +651,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
   def test_tex
     r = process('tex', 'web' => 'wiki1', 'id' => 'HomePage')
-    assert_success
+    assert_response(:success)
     
     assert_equal "\\documentclass[12pt,titlepage]{article}\n\n\\usepackage[danish]{babel}      " +
         "%danske tekster\n\\usepackage[OT1]{fontenc}       %rigtige danske bogstaver...\n" +
@@ -669,7 +669,7 @@ class WikiControllerTest < Test::Unit::TestCase
     
     r = process('web_list')
     
-    assert_success
+    assert_response(:success)
     assert_equal [another_wiki, webs(:instiki), @web], r.template_objects['webs']
   end
   
diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
index 54f5990e..c0f80945 100644
--- a/test/unit/page_renderer_test.rb
+++ b/test/unit/page_renderer_test.rb
@@ -156,11 +156,19 @@ class PageRendererTest < Test::Unit::TestCase
         '_should we go ThatWay or ThisWay _')
   end
   
-  def test_content_with_wikiword_in_tag
+  # wikiwords are invalid as styles, must be in "name: value" form
+  def test_content_with_wikiword_in_style_tag
     assert_markup_parsed_as(
-        '<p>That is some <em style="WikiWord">Stylish Emphasis</em></p>', 
+        '<p>That is some <em style="">Stylish Emphasis</em></p>', 
 	    'That is some <em style="WikiWord">Stylish Emphasis</em>')
   end
+ 
+  # validates format of style..
+  def test_content_with_valid_style_in_style_tag
+    assert_markup_parsed_as(
+        '<p>That is some <em style="text-align: right;">Stylish Emphasis</em></p>', 
+	    'That is some <em style="text-align: right">Stylish Emphasis</em>')
+  end
   
   def test_content_with_escaped_wikiword
     # there should be no wiki link
@@ -196,9 +204,10 @@ class PageRendererTest < Test::Unit::TestCase
     assert_markup_parsed_as( 
       '<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.</p>', 
       'This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.')
-        
+       
+    # currently, upper case HTML elements are not allowed
     assert_markup_parsed_as( 
-      '<p>This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.</p>', 
+      '<p>This &lt;IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.</p>', 
       'This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.')
   end