removed short tags and other minor changes