fixes, clean