Fixes to db, added will_paginate gem