general update - comments added and additional tests added