MOre updates and bug fixes