fixed the issues with extra stuff