Fixing more bugs, only 3 left.