Minor changes b/c of TODOs
Some more mods based on checking stuff in TODO
Re-layed-out and rerouted uplighter pcb