Minor debugging, layout changes