More updates

Just a bunch of updates pushing as pull request.