Working on bug fixes.