Comments and misc. fixes