fixed most of the issues somehow