Fixed some stuff, still broken.