removed a couple short tags and suppresed expected warnings