more fix stuff