More shit fixed*