Completed translation, adjusting a few things