#1179 Moar comments, think this can be considered fixed now