reorganization
bug fixes