code cleanup
bug fixes.