Some minor changes, error is still there..