fixes, cleaning