Still more bug fixes.
WE GOT IT!