Partial 2.4.10 Resolve Pending Issues

solving for class issues
found a bug in personal issues