more updates to basic source