Fixed spaces being appended..
Added a crude implementaiton of tabs