bunch o testing changes