Fix collision
Rawr silent failure with undefd param
Some stuff was changed.