Updated a few things

Might release this as a final version.