fixing language and adding features
finalizing some stuff