Edit order of some pieces of code; edit comments; still have layer control bugs