Re-added closetags, and some new updates