Some small changes, big bug still not fixed