improved tab handling
updated messages