fix stuff maybe