Did a few improvements