small fixes, replace