fixed my bugs!