notes comment and some fixes