Made more bug fixes!