Add my bugs/improvements