fixing some screw ups
fixing more screwups