ne comments and a few fixme added
title change