Some shit fixed