Added new languages, cleaned up