edited history and os intro