Fixed a few small things, and I added an extension system for my own purposes.