Minor improvements and updated doc blocks