Updated a few features, added some extract functions.