Fixed a bajillion bugs!