some clean up  + fix o+