Added constants to avoid multiple occurances
Updated lang strings
Code Cleanup and added default options