fix'ed comments
merge