fixed formatting bugs and language