Added comments, fixed migrations