modalled everything. minor messages changes.