Tweak layout of metal.c
Tweak rakefile