Done some fixes!