and fixed my bugs