functions clean up
init functions update
add support for internationalisation