Trying to fix bugs.
Working better now.