Merging

Finished merging with Thearith's last commit.