Ported to MC 1.5; Fixed a couple of minor issues.