update 230914

small updates, cleaned the code