more updates
fixed early draft