Added things, and fixed some bugs.