fixed short mode bug

Fixed short mode bug and eliminated a few more alerts