FS-2 Minor changes: TODO implemented and system outs removed