added some methods, fixed carriage return