Further refactored, Reverted Minecart change

Other small changes.