cleanup and bug fix
another bug fix