Comments and bug fixes