fixed some things. most things are still broken.