Fixed Boundary conditions and cleaned things up.