Latest changes and bug fixes