Fixed bugs

Fixed zee bugs.