Bug fixes and dealing with With statements better.