Bug fixes [I really need to get the rails server working on my laptop]