Cleaning up po files and making calls the same
Got the options working sexy-like