Resolved some bugs
Added strip of newline