main, layout: Minor clean-ups and added some further logging