Adjusted closure command functionality, was slightly unstable. Added some extensions.