Fixed more bugs!
More bugs fixed!