Add Bug#comments and some documentation