Updated some semantical things.