user bugs fixed