fixed shit, things are still broken though