Fixed a few things.
still fixing?