Added stuff and minor changes.