Misc. code tweaking.