fixed my bugs