Some cleanup. Some bugs...