Minor improvements, added non-functional comment form