Fixed gabo's errors