Add new classes/hooks for minecarts, minor changes