fixed remarks. tests added. whole bunch of tests added