Some quickfixes and comments