Some more performance and output improvements