Hmm, added request.getSession(); + various small things...