minor changes (making less platform dependent)