some style changes and message fixes
!!