fixed a few things. Still working on it.