all dev has been done. discovering and fixing bug...