Minor improvements. :)