Updated to 1.6.1 (Very buggy entity wise)