Fix few newlining problems. Still WIP.