little formatting changes. really need to get this ERBified.