Shorts Tags removed / minor changes

There were some short tags left that we removed with this version.
additionally we made few smaller changes.