Fixed Flint and Steel, reverted Minecart change, renamed a parameter name