Update on taxes an minor fixes