more random changes to clean things up