MOAR fixes with ROM version

is this ok?