Fixed several small bugs, like empty comments for example