fixed stuff, still broken