some @user fixes
took off split