several changes
bug fixes