small tweaks and remove todo note