feat + fix: change todo to be more prominent + use java deafults wherever possible