v6.0 - cleanup, final bug fix
6.0 cleanup, final bug fix.