add some remarks for the remaining things to fix