Commented user info and some tabbing changes