small fixes, issue persists