Adding comments, adding migration, minor changes