Updates

Will work on my commit history. :(