fixed easy bugs