fixes second user bugs