more work porting to MC 1.7