+ More fixes muthafuckaaaa!!!