fixed null
change translations cleaned up a bit