Several modifications and updates