removed TODO and FIXME declarations
fixed length-bug input