Fix style
Remove done/wontfix TODOS + add comments