several changes and updates