more updates and bug fixes