more updates and some minor improvements