Misc Update

Pushing everything I have.