v5.4.0 Beta #2

A few fixes, and a new energy cube.