table is added, some smaller changes