fixed leftovers from rebase and included comments