Added comments and modal fix