clean up parsing, move power rail
better spacing