Fixed HJ's many bugs!