Add comments and do hotfixes. Remove some TODO