fix stuff so it works