fixed stuff...but other stuff is still broken for now.